Fixed my name
Merge branch 'master' of https://github.com/EECE281GroupAwesome/Projects

Conflicts:
	README.md
Merge branch 'master' of https://github.com/EECE281GroupAwesome/Projects