preparing for merge
Merge branch 'master' of https://github.com/deniztaneli/devgui2014
updated .gitignore to ignore all data files