gemfile
Merge branch 'master' of github.com:sarl-hackerspace/projectplay-server
Merge branch 'master' of github.com:sarl-hackerspace/projectplay-server
Merge branch 'master' of github.com:sarl-hackerspace/projectplay-server
Merge branch 'master' of github.com:sarl-hackerspace/projectplay-server
Model and controller code for Tropo MVP