Initial commit
Ignore log & temp files
Merge branch 'master' into tendou
:
Conflicts:
	.gitignore