Switching tabs to spaces and fixing server crash bug

Not sure why it was in tabs originally... Whatever.
Also, fixes #7
Merge branch 'fix_7'

Conflicts:
	parser.py