Including Main.c/.h files
Including Main functionality
Implementing function main files
Including Main functionality
Merge branch 'master' into niels

Conflicts:
	main.c
	main.h
gfh
Merge branch 'niels'