shantel
Merge pull request #2 from sunshineot/master

shantel
Merge pull request #1 from shayjay76/master

Changes