git test
Merge branch 'master' of https://github.com/ckahle33/CNS_3root

Conflicts:
	A Test File to Sync Git
	CNS_3home.sublime-project
	CNS_3home.sublime-workspace