updated
Merge branch 'master' into local_jahlex

Conflicts:
	activity1.txt
Merge pull request #1 from jahrodillas/local_jahlex

updated