Fixed general stuff.
Merge branch 'master' of https://github.com/Robopoly/prismino-libraries

Conflicts:
	libraries/PRismino/prismino.cpp