button functionality
Merge branch 'master' of http://github.com/chickensouple/teamUp