Added comments for readability
Merge branch 'master' of heroku.com:projectcollabo into to/Profile

Conflicts:
	Gemfile
Added comments
Set up fog