test 2
Merge branch 'radzisze'
started making activities - chris, its already set up to go to your
classes, just uncomment the lines since they were causing errors for me
while yours didnt exist yet.