local form
merge fixes
Merge branch 'master' of https://github.com/Armi23/AM115TeamProject