launchpad working on jaz's laptop now
reactivating uncommented code
few finishing touches made
merging resolved
Merge pull request #16 from jasminmayfield/refactoring

Refactoring