Updated styles to match GR wireframes
Merge branch 'integration' of https://github.com/60frames/api-server into integration

Conflicts:
	public/styles/main.css