COMMITS ARE COMING AGAIN! WE SHALL REBORN IN FLAM...ehm BUGS!
Merge branch 'master' of github.com:mrgamer/grumpy-blog

Conflicts:
	.gitmodules
	package.json