working on non house parser
Merge branch 'master' of https://github.com/Brandonmchu/rep
resolve conflicts
non house parser