added ActionListener
Merge branch 'master' of https://github.com/averyhockridge/amazing-rep