pulling
merging
Merge branch 'master' of heroku.com:callouts-app
Changed conf for heroku push
Merge branch 'master' of heroku.com:callouts-app
Fix betsController
Fixed buggy interaction between challenge and friends button
Fixed some issues regarding pictures not displaying properly
Hopefully fixing a bug with time
Fixing some bugs regarding time not displaying correctly
Merge branch 'master' of https://github.com/jakeesmael/callouts