Merge pull request #3 from ohlincik/master

Fix user pages spec
Added bookmark/unbookmark functionality
Added partial to User show page
Merge branch 'master' of https://github.com/MrBeardface/Tips_on_Rails