Changed tabs to four spaces
Some network table stuff and misc stuff
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	main.cpp