First commit
Added some comments
Preparing for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore