staying topdown
Merge branch 'master' of github.com:tmlayton/globalhack

Conflicts:
	public/index.html
	public/scripts/01de7852.vendor.js
	public/scripts/08eb619f.vendor.js
	public/scripts/c1b9f66e.vendor.js
fixing styles on mv
Merge branch 'master' of github.com:tmlayton/globalhack

Conflicts:
	app/views/main.html
	public/index.html
	public/scripts/01de7852.vendor.js
	public/scripts/08eb619f.vendor.js
	public/scripts/abcd1778.scripts.js
	public/scripts/c1b9f66e.vendor.js
	public/styles/2b752ac3.main.css
	public/styles/4c405695.main.css
	public/styles/b57209b6.main.css
finish logic mv