started on Address controller tests
show view up and spec/feature folder created
address controller, views and controller tests
fixed merge conflicts
fix routes conflict
Merge branch 'AdamSmith910-master'