Git Nonsense
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/styles/_static-elements.scss
	assets/styles/styles.css
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 81802f557366b6d1e9836ecb566786ec00e8c051.