reset to a previous version, bundle upgrade fucked up everything
Merge branch 'master' of github.com:CaDs/tokyo-project