added prices
Deleting sales
Merge branch 'master' of https://github.com/seats/seats

Conflicts:
	public/javascripts/app.js (SOLVED)