Many changes
Merge branch 'master' of github.com:corn-x/web

Conflicts:
	app/assets/javascripts/application.js
	app/views/layouts/_navigation_links.html.erb
Merge branch 'master' of github.com:corn-x/web