Installed CodeIgniter 2.1.4
Merge branch 'master' of https://github.com/rchuber/registeryourteam

Conflicts:
	.gitignore