Working version
Merge branch 'master' of github.com:mik3cap/hackbushwick2014

Conflicts:
	common/style.css
	sample_app.py
	static/index.html
FIXED