changed template
Merge branch 'master' of https://github.com/JadGhosn/spongemap
Merge branch 'master' of https://github.com/JadGhosn/spongemap
switched to django
ignore pyc files
merging
refactor
minor
add static files config
merge
Merge branch 'master' of https://github.com/JadGhosn/spongemap

Conflicts:
	spongemap/templates/HtmlPage.html
	spongemap/templates/spongemap.html