Merge remote-tracking branch 'remotes/origin/wills_branch' into yelles_branch

Conflicts:
	app/static/css/milo.css
	app/static/js/milo.js