Added myenv to .gitignore
Merge branch 'master' of https://github.com/samsalisbury/qpop

Conflicts:
	.gitignore