fix coffee
Merge branch 'master' of https://github.com/gsmlg/rubyapp

Conflicts:
	app.rb
	coffeescript/home/articlesview.coffee
	coffeescript/home/headernav.coffee
	coffeescript/home/layout.coffee
	views/templates.erb