Merge pull request #11 from rphuber/master

Angular framework
fixed a mirgation
Merge pull request #12 from gtlaserbeast/master

fixed a mirgation
fixed a mirgation
Merge pull request #13 from gtlaserbeast/master

fixed a mirgation
fixes communication between angular and json
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1