new post
project text update
project text update
finished post
Merge branch 'master' of github.com:moppedisco/blog

Conflicts:
	css/style.css
	css/style.less