more chnages - arghhh not a good comment at all!
Merge branch 'master' of github.com:teamwinit/yahoohackusa

Conflicts:
	public/css/app.css
	public/js/controllers.js
	public/js/directives.js
	views/layout/layout.html
	views/templates/activity_items.html