Merging attempt
Merge branch 'master' of github.com:fireblade99/journalgraph

Conflicts:
	lib/tasks/makedb.rake