Comments and Functions

Added comments and a few empty functions to the main
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.cpp