unfucked
Merge pull request #10 from gtlaserbeast/master

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

Angular framework
Merge remote-tracking branch 'upstream/master'
fixed a mirgation
Merge pull request #12 from gtlaserbeast/master

fixed a mirgation
Merge remote-tracking branch 'upstream/master'
fixed a mirgation
Merge pull request #13 from gtlaserbeast/master

fixed a mirgation
Merge remote-tracking branch 'upstream/master'
fixes communication between angular and json
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1
Merge pull request #14 from rphuber/master

Creates connection between angular and json
Merge remote-tracking branch 'upstream/master'