remove feature a
Merge branch 'master' of github.com:TheTeamA/gitTest

Conflicts:
	main.c