got it
Merge branch 'master' of https://github.com/jasonnaso/projecttest

Conflicts:
	.DS_Store
adding new files
hi