It's a commit!!!!
commiting now
Merge pull request #24 from DePaul2015SEStudioTeam1/testfeature

Testfeature