Merges files
Merge branch 'master' of github.com:IvanVP/glash
Some changes