Merge pull request #15 from mattforni/master

Updated manifest for testing and added the 'separate' method to the Message class
Merge pull request #16 from mattforni/master

Updated InputListener to be a bit more succinct and hopefully correct