Merge branch 'master' of https://github.com/babatundeodaniel/upperlink-registar-module

# Conflicts:
#	.gitignore
#	LICENSE
#	README.md
#	hooks.php
#	registrarmodule.php
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 2 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   .gitignore
#	new file:   .gitignore.orig
#	modified:   LICENSE
#	new file:   LICENSE.orig
#	modified:   README.md
#	new file:   README.md.orig
#	modified:   hooks.php
#	new file:   hooks.php.orig
#	modified:   registrarmodule.php
#	new file:   registrarmodule.php.orig
#
