Updating routes
Removing tmp from gitignore
Revert "Removing tmp from gitignore"

This reverts commit f521f5ba6c1a3493b2f484fb3f354a43c0d8ef92.
Removing tmp
Updating Procfile to github.com/alexefish/blog
Revert "Updating Procfile to github.com/alexefish/blog"

This reverts commit 8e01a2f340ab1b21e9e57306da4b7d9657fcaffd.
trying out blog in .godir
Revert "trying out blog in .godir"

This reverts commit 94d4407d20734001030e3ad7c5afd54c691434d4.
Setting blog.db config value
empty commit
Removing procfile
Merge branch 'master' into develop

Conflicts:
	conf/app.conf