just commmitting to pull
corrected merge conflicts
Merge branch 'master' of https://github.com/kaplali/parkstorm
Merge branch 'master' of https://github.com/kaplali/parkstorm
deleted some files, working on profile page. Need to get notifications fixed
profile mvp done
Merge pull request #27 from kaplali/extra_search_bar

Extra search bar
Add favicon
Add link to favicon in view
Merge with master
Merge pull request #28 from kaplali/add_favicon

Add favicon
Merge pull request #22 from kaplali/profile

Profile
Merge branch 'master' of https://github.com/kaplali/parkstorm into notifications_button