intellij crap
Merge branch 'master' of github.com:dmcneil/outdoors_android
redoing the user session stuff (AsyncTask, cleaning code up)
Merge branch 'master' of github.com:dmcneil/outdoors_android
nothing important to note
Merge branch 'master' of github.com:dmcneil/outdoors_android
move a bunch of stuff around, too much to list