first commit
Merge branch 'master' of https://github.com/hellowsummer/hellow2summer

Conflicts:
	AsciiArt.py
	main.py
	stylesheets/all.css
	stylesheets/demo1.css
	templates/ascii-art.html
	templates/date calculator.html
	templates/demoinfo.html
	templates/factor.html
	templates/main.html
	templates/rm cls schedule.html