structuring activities and layouts a bit
Merge branch 'master' of github.com:pstoica/CS3251-project-4