d
Merge branch 'master' of github.com:jakecrump/design

Conflicts:
	happyhour/index.html
Merge branch 'master' of github.com:jakecrump/design

Conflicts:
	happyhour/index.html

git commit -m 'fuck'
Merge branch 'master' of github.com:jakecrump/design
Merge branches 'master' and 'master' of github.com:jakecrump/design

a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:jakecrump/design

don't fucking ask me again
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design
Merge branch 'master' of github.com:jakecrump/design