made changes to the unit tests and front end
made changes to the unit tests and front end
Merge branch 'master' of https://github.com/palotas/TMFSydney2014