read me fix
fixed conflict
merging to staging after with icons/google map api styling
Merge pull request #5 from powellmichael/staging

merging to staging