derpity daltons changes woot
Merge branch 'master' of https://github.com/theMagicalKarp/wanderlust into htmltemplate

Conflicts:
	Wanderlust.html
	css/main.css
Merge pull request #3 from theMagicalKarp/htmltemplate

derpity daltons changes woot