setup lab2
Merge branch 'master' of github.com:ThompZon/popup