Merge branch 'html_mockup' of https://github.com/ercchy/actifaction into html_mockup
adding doctype
Adding doctype
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
Merge branch 'master' of github.com:CodeCatz/actifaction
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
fixing index template
Merge pull request #11 from ercchy/master

adding top navigation bar
Added Action in models
Merge pull request #12 from lesnuits/master

Added Action in models
Added unicode method for Action
Merge pull request #13 from lesnuits/master

Added unicode method for Action
fixing index template
making more templates
Merge remote-tracking branch 'upstream/master' into html_mockup