Merge branch 'louis'
Remove some AngularJS boilerplate
Move the MainCtrl to the entire app
Switch to a service to manage the user & other storage
Merge branch 'feature-loginregister'
MVC all pokemon id pokemon
remove userCheck
conflict resolve