jso objects
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
json routing
small changes
Merge pull request #19 from rarice4/master

routing
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
added some functionality
created a new column in db for UN
Merge pull request #20 from crotten/master

created new column for UN in db
fixed merge conflicts