Main functionality in place. Greater unit testing needed
added tests and fixed bugs
Merge branch 'master' of https://github.com/DavidTimms/tiny-style