Init
Merge branch 'develop' of https://github.com/FlandreDaisuki/1215 into TeamCSS
change margin and padding
change list style and width
Merge branch 'TeamCSS' of https://github.com/hane1818/1215 into TeamCSS

Conflicts:
	index.css
Merge branch 'TeamCSS' of https://github.com/hane1818/1215 into TeamCSS

Conflicts:
	index.css