working on views and controllers, done with activity and halfway thru village
Merge branch 'exp'