Initial import
Merge branch 'master' of https://github.com/emjaksa/scroungeit

Conflicts:
	.gitignore