Merge branch 'master' of github.com:CodeCatz/actifaction
Merge branch 'html_mockup' of https://github.com/ercchy/actifaction into html_mockup
adding doctype
Adding doctype
adding back the templates file
Merge pull request #6 from ercchy/master

Adding removed template file
adding back the templates file
Merge pull request #7 from ercchy/master

adding back the templates file
Updated .gitignore
New main_page template
Merge branch 'master' of https://github.com/CodeCatz/actifaction into html_mockup
Merge pull request #1 from naisnouk/html_mockup

Html mockup
base template added
defined urls based on templates
Merge pull request #8 from ialja/master

defined urls based on templates
Merge branch 'master' of github.com:CodeCatz/actifaction
Setting up views
Merge pull request #9 from ercchy/html_mockup

Starting to add teplates
Merge pull request #10 from Konviser/master

Setting up views
fixing index template