have working version of actvity
Merge pull request #13 from scopatz/master

have working version of actvity