v0.7
Merge branch 'master' of https://github.com/Superpencil/Superpencil

Conflicts:
	css/main.css