acccc
Merge branch 'master' of https://github.com/Jae10/git_test

Conflicts:
	a.c
Merge pull request #5 from rtboss/master

acccc