thi is a commit
Added bootstrap to the program
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of https://github.com/cosc617g4/project
because it wont let me otherwise