codeigniter installed
logo
Added voevents function to Xmlmodel
Added decoding of json to array
working on JSON
merge conflicts
13 voevents in database, able to be retrieved with model function
Merge branch 'xmlparse' into develop

* xmlparse:
  13 voevents in database, able to be retrieved with model function
  working on JSON
  Added decoding of json to array
  Added voevents function to Xmlmodel
Added weather function
ip coordinates grabbed
Added complete weather function
Merged confilt solved
weather grabbed
Merge branch 'weather' into develop

* weather:
  weather grabbed
  Added complete weather function
  ip coordinates grabbed
  Added weather function
amalgamated
Done Feed Page
Merge branch 'feature/bootstrapIntegration' into develop
ui in place
first styles need fixing
Google maps code added