Whatever
Striped one line
Testing pushing from other machine.
filipe here
Merge branch 'wip'

Conflicts:
	wiw/wiw
Merge branch 'wip2'