new style stuff
Merge branch 'master' of https://github.com/savannahjulian/DivinePie

Conflicts:
	css/dpstyles.css
	index.html
	sass/dpstyles.scss