Changed some Keywords
Merge branch 'master' of https://github.com/Lowkey2224/VS-2014-SS-A1