asset folder and default sql added
testing push
bootstrap dialog
Merge branch 'master' of github.com:vjega/python-tutorial
added gitignore for seetings.py
statistics template created
conflict fixed
more pages
more pages
commit with changes
fix on settings.py
boodstrap dialog plugin added
Merge branch 'master' of github.com:vjega/python-tutorial
more work on dialogue
add functionality add
changes on views
Merge branch 'master' of github.com:vjega/python-tutorial
mind map added
conflict fixed
another conflict fixed