Angular
Merge branch 'master' of github.com:scwu/fb-hackathon-s2013

Conflicts:
	assets/js/main.coffee
	assets/js/template.js