change to dev branch
Merge remote-tracking branch 'origin/Dev'

Conflicts:
	File in dev.txt
del file
Merge pull request #4 from svefro/Dev

del file
make file in master
Merge pull request #5 from svefro/master

update from master to dev