Merge pull request #5 from mhd0003/master

adding files to my branch
Merge pull request #7 from mhd0003/jordan_Branch

Merge pull request #6 from mhd0003/master
Update gitignore with java files
added base code

currently returns the string back to the client.
added goals
Update .gitignore
Merge remote-tracking branch 'origin/ian_Branch'

Conflicts:
	.gitignore
Merge pull request #9 from mhd0003/master

Requesting a pull