minor changes
Merge branch 'master' of https://github.com/urucaro/edu

Conflicts:
	src/scripts/first.py
Merge branch 'master' of https://github.com/urucaro/edu

Conflicts:
	src/scripts/first.py