Edited 2.0
Merge branch 'master' of https://github.com/henrybond158/Smart-Programming-Project