Draft
lel shitkids

lelelelele
this is stuff i did

go me
Delete index.html
Delete index.html
sync up with the master branch

sync up with the master branch
Merge remote-tracking branch 'origin/Charles' into Charles

Conflicts:
	ec/WebContent/index.html
moved to under "ec\WebContent"

moved to under "ec\WebContent"
Merge remote-tracking branch 'origin/Charles'

Conflicts:
	ec/WebContent/index.html
Merge remote-tracking branch 'origin/master' into Walter02