Merge branch 'bcarroll22-master' into develop
Updated composer.json to include token package
Updated the app config file
Merge branch 'develop' of https://github.com/projectperi/peripeteia into develop
Get ready for upstream merge
Fixed merge conflicts
Working on the auth
Merge branch 'develop' of https://github.com/bcarroll22/peripeteia into develop
Merge pull request #3 from bcarroll22/develop

Adding in the auth API stuff
Merge pull request #12 from bcarroll22/master

Merging in Auth API, dependencies include Dingo
Update readme.md
Merge branch 'joshbnntt-master' into develop
Merge PR from joshbnntt
Merge the Angular routes
Update readme.md
sync with upstream