manish2
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	app/views/test_branch_controller_manish/manish.html.erb