pulling changes
Merge branch 'master' of https://github.com/JksnFst/WebGroupProject into HEAD
database update
Merge branch 'master' of https://github.com/JksnFst/WebGroupProject into HEAD