Initial import
Merge remote-tracking branch 'kim0/master'

Conflicts:
	.gitmodules