cleaning up
Merge pull request #1 from ialja/master

cleaning up *.pyc
first html mockup
Merge pull request #2 from naisnouk/master

first html mockup
Upgraded django to 1.6