First Commit
Merge branch 'master' of https://github.com/kidavis92/CS426