merging
Merge branch 'master' of https://github.com/dgolman/DANIEL-client

Conflicts:
	app/styles/main.css