made carousel work
Merge branch 'master' of github.com:teamwinit/yahoohackusa

Conflicts:
	public/js/controllers.js
	views/layout/layout.html