initial commit
Merge remote-tracking branch 'origin/master'
initial commit
Merge branch 'master' of https://github.com/joshbnntt/peripeteia
Merge pull request #1 from joshbnntt/develop

initial develop commit
Merge pull request #2 from joshbnntt/develop

Develop
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
autocomplete feature for feature dash
fixed mouseclick error with angucomplete
validation now working with angular.
fixed file name error
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