Made changes to function names to meet decided upon format
Merge branch 'development' of https://github.com/latreides/SE_Team3 into development