some changes
merging msq.r ...

Merge branch 'master' of https://github.com/nachalca/mosquito_shine

Conflicts:
	msq.R