user changes
Merge branch 'master' of https://github.com/muvic08/A100_Website