First update from computer
Initial rails project creation
Merge branch 'master' of https://github.com/facecheekwall/tinder

Merging with existing initial setup