Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
changes due to warmup update
bugfix
tabs fix
Merge pull request #5 from Basert/master

Adding last commands for warmup