Initial commit
Merge branch 'master' of https://github.com/uscacm/Team2_FallHackSC

Conflicts:
	README.md