moved to app folder
Merge branch 'master' of github.com:prohfesor/backup

Conflicts:
	.gitignore
gitignore merge
cleanup after moving git root to ./app/