Commit
Merge branch 'master' of https://github.com/ccphillip/COSC617Project.git

Conflicts:
	Gemfile