Merged
Merge finished
Merge branch 'master' of https://github.com/bbbales2/stochss

Conflicts:
	launchapp.py