fixed http
Merge branch 'master' of github:andytl/dubhacks-2014