Serve site using rack
Merge branch 'master' of heroku.com:blooming-scrubland-5721

Conflicts:
	public/index.html