Merge pull request #32 from sunny-mittal/sunny

Sunny
Merge pull request #33 from sunny-mittal/sunny

Make minor edits
Merge pull request #34 from sunny-mittal/sunny

Make more formatting changes
Custom map icon functionality.
updated readme.
Merge branch 'nManos'
Fix merge conflicts
Merge branch 'master' into gabe
Merge branch 'gabe'
Fix tests and formatting issues