Restructured app
Merge branch 'master' of github.com:tomjowitt/lumberjack

Conflicts:
	.gitignore