update
Merge branch 'master' of https://github.com/bpak788/WSP-Online

Conflicts:
	.gitignore