finished userstory1
finished userstory2 and 3
fixed build
fixed build
finished userstory 4
finished userstory 5
finished userstory 6 and 7
finished userstory 8
temp
finished userstory 9
fixed userstory 6
fixed userstory 10 and 11
broke everything
broke everything some more
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/index.html
	client/js/controller.js
	client/partial/index.html
	client/partial/movies/_form.html
	client/partial/movies/detail.html
	client/partial/movies/list.html
	server/routes/movies.js
fixed program, fixed conflicts and happy times ahead!