- Begin styling
Merged develop branch into master
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css