this is the first commmit
Merge branch 'master' of https://github.com/tanelso2/SPIMBOT

Conflicts:
	spimbot.s