alterations to user show page
some terrible css
pagination throgh users
kaminari twitter bootstrap
gem merge conflict fix
gem merge conflict fix
Merge branch 'development' of github.com:tmerlet/Photoapp into development