Merge pull request #1 from svefro/master

dev file
reset master from dev
Merge remote-tracking branch 'origin/Dev'

Conflicts:
	File in dev.txt