meh
Merge branch 'master' of https://github.com/oscarmagedon/labs-javascript

Conflicts:
	labs/Generals/main.php
redoing