basic calendar now working on selecting dates for ramble
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
I have no idea
fixed merge conflict
fixing notes
Merge pull request #55 from gregburton/master

Added locations; geocoder working but not yet interacting with APIs
calendar and note scrolling working in harmony
fixed merge conflict
fixed merge conflict
Merge pull request #56 from dheckman/master

	calendar and note scrolling working in harmony
did some code cleanup in the user model