Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Netcom changes
Merge pull request #73 from AlexMaxseiner/master

fixed changes for NetworkCom...Finally
Deleted Stuff, commented out everything, changed ";"'s to ":" removed Herobrine -Jeff
Merge pull request #75 from AlexMaxseiner/master

No need to check these changes, just minor things
Merge branch 'master' of https://github.com/swarage/612-2013 into swarage-master

Conflicts:
	launcher.cpp
	ports.h