working on mockup
updating html mockups
Merge pull request #16 from ercchy/master

Started work on tests for views
Merge pull request #2 from naisnouk/html_mockup

working on mockup
Merge branch 'html_mockup' of github.com:ercchy/actifaction into html_mockup
working on templates
added settings_local.py to .gitignore
Merge branch 'html_mockup'