small ineffectual changes
Merge pull request #14 from marcnischan/update-gitignore

removed public directory from gitignore
Merge pull request #13 from marcnischan/add-google-map

Add google map
just lost all the stuff I added to the json file ?!?
Merge branch 'master' of github.com:detroit-labs/miautismapp
merge recent branches
Merge branch 'style-search-results'
merging everythign
asdf