fixing index template
making more templates
Merge remote-tracking branch 'upstream/master' into html_mockup
making more templates
Merge pull request #14 from ercchy/master

Adding more templates
working on mockup
Changes names of views and urls
Merge pull request #15 from Konviser/master

Changes names of views and urls
PEP8 compliance fixed
updating html mockups
adding tests for views
adding tests for views
Merge remote-tracking branch 'upstream/master'

Conflicts:
	actifaction/web/urls.py
	actifaction/web/views.py
cleaning up
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'