Initial commit
Merge branch 'master' of github.com:notice501/AllInOne

Conflicts:
	.gitignore