updated style
playing around with blog style
Merge branch 'master' of https://github.com/thetmkay/joji
changed style to black and white
merge conflict and gitattributes
Merge branch 'server' of https://github.com/thetmkay/joji into server

Conflicts:
	.gitattributes