Merge branch 'master' of github.com:ManyBaby/wearethediggers
first implementation of pundit
mergin branches:

merge branch 'master' of github.com:ManyBaby/wearethediggers

Merging to push forward

:w
:wq
Merge branch 'master' into implementing-pundit
Merge pull request #13 from ManyBaby/implementing-pundit

Implementing pundit
fixed a bug with signin
basic show and index views implemented
Merge pull request #14 from ManyBaby/create-basic-views-for-soldiers

Create basic views for soldiers
shuffle pictures merged