inserts testperson controller in ruby
fixes merge conflicts
adds controllers and services for angula routes
Merge pull request #11 from rphuber/master

Angular framework