Merge branch 'dev' of github.com:rogan2929/Swapper-s-Delight into dev

Conflicts:
	css/main.css