renamed index.js to server.js
Merge branch 'master' of github.com:robgraeber/personal-blog

Conflicts:
	server.js