Initial Commit
Merge remote-tracking branch 'Origin/master'

Conflicts:
	.gitignore