Initial commit
Merge branch 'master' of https://github.com/CodeCamps/Class2013

Conflicts:
	LICENSE
	README.md