zer# Please enter the commit message for your changes. Lines starting
 Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Console.js