Changed merge jsp to display program name
Merge pull request #23 from mlennon3/master

Ayanga & Michael | Changed merge jsp to display program name