Commented out map centering and zoom properties
Merge branch 'master' of https://github.com/tthornton32/sports-app
tupid vim commit
Merge branch 'master' of https://github.com/tthornton32/sports-app
merging change to users controller show action
about to pullfixed marker info changes
fixed merge conflicts in index and games controller
got twilio working