First file
merged stuff

Merge branch 'master' of https://github.com/Nicknguyen128/Start

Conflicts:
	Helloworld.c