changing event views
merge issues
changed some events
new merge
precompiled
fixed a couple links
deleted sample.rb
changed sharing icon location
mandrill
gems
fixed up the email abit, mandrill setup, heroku pushed
changed some views
facebook login integeration
merge conflicts
added logic for facebook login, not active for user yet
like/follow stuff
n
:wq
:qw
exit
gerge branch 'cenderin-master'
fixed merge conflicts