changes
changes
changes
Merge branch 'Checkout'

Conflicts:
	assets/stylesheets/main.scss