unifiying stuff
view logs is working!
MVP!!!!1!1!11!!  eventy-one
Merge branch 'ale'
Delete controller.rb
Merge remote-tracking branch 'origin/ale'
resolving conflicts is hard
can I do this?
Merge branch 'ale' of https://github.com/alosada/the_log into ale
Merge branch 'master' into ale

e ignored, and an empty message aborts
Merge branch 'ale'
will this merge now