merged
Merge branch 'dheckman-master'
.env
.env is there
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
working on note form for rambles
Merge pull request #28 from gregburton/master

added logins helper back in to allow for standard user login
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
notes on rambles working
touched up some notes
login working with foursquare,twitter and self
working on JS for note refresh
notes on ramble working, JS working as well
Merge pull request #30 from Noahhh/master

Merge troubles fixed.  Added notes to rambles page. Added a little JS to make notes add without page load.
merge conflicts
meeerge
Merge pull request #31 from Noahhh/master

Merged from dani, '	login working with foursquare,twitter and self '
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added login partial to home page. only appears when no user is logged in