Added some tests/views/controllers for creating new dwelling
fixed merge conflict