merging
Merge branch 'master' of https://github.com/Jyeil/projectS3

Conflicts:
	main.c