- initial commit
Merge branch 'master' of github.com:theorm/jourdata

* 'master' of github.com:theorm/jourdata:
  Initial commit

Conflicts:
	.gitignore