finish midterm
Merge branch 'master' of github.com:matttelliott/it-140-angular

Conflicts:
	app/scripts/controllers/midterm.js
	app/views/midterm.html