fixes
Merge branch 'master' of github.com:gcedo/techcrunch-hackathon
bugs