Changed Header Formatting

So it looks good in VS.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp