Initial import
Merge pull request #1 from EslamElHusseiny/master

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

Conflicts:
	.gitmodules