Merge pull request #7 from rarice4/master

update
minor change
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
changed the routes to ng from ruby
Merge pull request #8 from crotten/master

Converted the routes to ng from ruby
changes
fixed merge conflicts
Merge branch 'rarice4-master'
Merge pull request #10 from crotten/master

Fixed merge conflicts
fixed merge conflicts
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
Merge pull request #11 from rarice4/master

e
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
helping the peeps
Merge pull request #12 from crotten/master

Updating it to the most recent version
removed an extra ng-view
Merge pull request #13 from crotten/master

removed an extra ng-view