PHP Info
Merge branch 'ryan' of https://github.com/HammockHackers/iCollaborate into ryan

Conflicts:
	app/routes.php