style.css
style.css
Merge branch 'master' of https://github.com/jack0lantern/Awesomifier

Conflicts:
	index.html
	style.css