Cleaned up code and removed extra files
Merge branch 'master' of https://github.com/namespacestd/ads_project1