fixing button issues
Merge branch 'master' of https://github.com/vivekaraj/SockOnTheDoorBitCamp2014
fixing button issues