added a bunch of stuff by accident
Merge branch 'katie'
Merge branch 'master' of github.com:brigid2718/goatique