Saving unsaved changed
Fixed conflicts
Removed a toned of files note needed
Fixed conflicts
Added ArcGIS as a service
Removed unncessary map
Moare stuff
Adding Foundation
Added modernizr