put git ignore in there
merged master into vosters2 branch to get this development branch