first commit
Merge branch 'master' of https://github.com/ddcho92/Testing

Conflicts:
	README