Merge pull request #1 from Wideweb/master

jjvv
1
Merge remote-tracking branch 'LagMegantic/master'

Conflicts:
	.idea/misc.xml
	first.py