fixing merge.
removing uneeded files for a build and testing git ignore.
Merge branch 'Development'
Testing merge from master to development.