Added slightly buggy parse/object conversion
Merge branch 'master' of https://github.com/Veste/SE465_Project