pricing
Merge branch 'master' of https://github.com/flightllc/flight

Conflicts:
	public/css/text.css
	public/css/text.min.css
Merge branch 'master' of https://github.com/flightllc/flight