merged master, resolved conflicts
Merge branch 'afro' of github.com:knagra/farnsworth into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'afro' of https://github.com/knagra/farnsworth into afro
Merge branch 'master' into afro
Merge branch 'afro' of github.com:knagra/farnsworth into afro
Merge branch 'master' into afro
updated house map page
Merge branch 'afro' of github.com:knagra/farnsworth into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'afro' of github.com:knagra/farnsworth into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro