Reset so as to use haml in scaffolds
Removing idea stuff
Doh
Merge branch 'fixing_stuff'

Conflicts:
	.idea/shop.iml
	.idea/workspace.xml
	Gemfile.lock
What a waste of time