Merge branch 'html_mockup' of https://github.com/ercchy/actifaction into html_mockup
adding doctype
Adding doctype
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