stash
Merge branch 'master' of https://github.com/wyliethomas/irg

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'master' of https://github.com/wyliethomas/irg

Conflicts:
	app/assets/stylesheets/application.css
design in browser adjustments