making more templates
Merge pull request #14 from ercchy/master

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

Changes names of views and urls
PEP8 compliance fixed
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 branch 'html_mockup'
working on templates