haml files added
conflicts fixed

Conflicts:
	.idea/workspace.xml
	db/schema.rb