Added winodws formated textfile
Merge branch 'dev'