added print statements to places
complete merge
completing merge
I guess I changed button.html somehow
Merge branch 'master' of https://github.com/psethu/67-475-helicopter