Merge pull request #11 from slwaller/master

bootstrapping and email field
Merge pull request #12 from slwaller/master

fixing functionality
testing
fixed merge
Merge pull request #13 from slwaller/master

rendering as json
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
messing with routes and angular
Merge pull request #14 from ansleyjones/master

messed with routes...