First commit
Merge branch 'master' of https://github.com/RufusMbugua/UPID

Conflicts:
	.htaccess