init
mods
logo
nodejitsu settings
Merge branch 'master' of https://bitbucket.org/knappoleon/thmcards

Conflicts:
	package.json
auth stuff
favicon
logout link
title
background
nodemonignore
detail view heavy changes
ignore list
test
ajaxsetup
progress
http status code
db settings
settings
settings