remove haml; use erb
fix merge conflicts
add angular
fix merge conflicts
angular app
controller testing
Merge pull request #3 from cloudspace/68225804_initial_angular_app

68225804 initial angular app