Useless strip stuff
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	displayStrip.js