Initial commit
import Tumblr posts
Initial commit
Merge branch 'master' of github.com:funkylarma/funkylarma.github.io

Conflicts:
	.gitignore
start porting styling
adding some meat to the layouts
add tag and archive pages
make this stuff heroku ready
make this stuff heroku ready
Merge branch 'master' of heroku.com:glacial-tundra-8405

Conflicts:
	config.ru
add categories
Merge remote-tracking branch 'temp/master'