Javacriptery
Still don't know what a merge is

Conflicts:
	stylesheets/app.css