Add .gitignore
change routes
changes made to .gitignore
solved conflits
changes in vendor
better approach to rest server without using user_id
Channels urls are alive and bug fixed
Ignore local config files.
Fix .gitignore conflict.
Add server into bootstrap/start.php
 405 error in update user profile has been fixed
Merge branch 'master' of https://bitbucket.org/gurilla/server
merge conflits
 add user detail route and controller method
Circles routes are alive and changes made in Interest and Channel
Change made in routes and well documented with comments and also add additional routes to circles
Event Routes are alive and can not update so far
Change user resonse object
bug fixed on profile updated
Events routes for update is ready to use
Merge branch 'master' of https://bitbucket.org/gurilla/server

merge conflits