Updated the gitignore file
Forgot to delete some stuff in the main gitignore
Merge branch 'using-openlayers-3' of https://github.com/louwie17/Open-Layers-Street-Map into using-openlayers-3
Updated gitignore which got ignored during the merge
Got some small final changes