continued work on testing
Merge branch 'master' of https://github.com/Mebibyte/CS3300-Senior-Design into test

Conflicts:
	.idea/workspace.xml
	app/views/projects/new.html.erb