Updated Rules
Updated Rules
Updated Gemfile
Updated Rules
Deleted partials
Updated content
Added content
Updated Rules
Updated content
Merge branch 'dev'

Conflicts:
	Rules
	content/haml/index.haml