mnvbnbnm
Merge remote-tracking branch 'LagMegantic/master'

Conflicts:
	.idea/misc.xml
	first.py
Merge pull request #2 from Wideweb/master

master