Angular works now
Merge branch 'master' of https://github.com/justinyangusa/angelhack

Need to merge because <<<<<< HEAD detached whee jkdsfio1899328489230985290341>>>>>