Merge pull request #1 from CIT275DevGroup/master

Update from Dev Group
Merge branch 'master' of https://github.com/CIT275DevGroup/HelloWorld
Merge branch 'master' of https://github.com/CIT275DevGroup/HelloWorld
Added Text
Merge pull request #12 from jstraw45/Feature-2

Feature 2