Changes made to everything
Merge branch 'master' of github.com:MrBeardface/Tips_on_Rails