Added test for Create Makeathon page
Merge branch 'master' into coach-development
Created basic views for page to create makeathon and manage makathon
Fixed tests to deal with callback issues when requesting Zombie.js visit specific pages
Conflict fix attempt 1
Fixing second test .text issue
Four tests passing
Renamed routes to follow RESTFUL principles. Coach can now fill in details of makeathon on form
Students can enter name, email, and choices on a form
Added EJS layouts to package.json and student users can now fill out a form
Fixed route issue when coach form posted to makeathon/create page
Merge branch 'master' into coach-development

Conflicts:
	npm-debug.log
	package.json