a
b
Closes #12
Merge branch 'develop' into outro

Conflicts:
	ei
Merge pull request #19 from mira/outro

Outro