finished 1 and 3
Merge branch 'master' of https://github.com/dano8957/hackathon-datamethods