Merge pull request #11 from squallcs12/develop

finish stage allow website to work
Merge branch 'master' into develop