partial
Merge branch 'master' of github.com:gilchenzion/hack-ny-fall2013