Initial commit
Merge remote-tracking branch 'shurgram2/master'

Conflicts:
	README.md