adding the gitignore
Adding everything else
Merge branch 'master' of github.com:wmak/Theia

Conflicts:
	.gitignore