inital commit
Merge branch 'master' of https://github.com/bpak788/wsp-online-student

Conflicts:
index.html
updated index
update
update