changes to gitignore
fix conflicts
Merge branch 'master' of https://github.com/russelltaff/lootly
starts adding views