one commit
# This is a combination of 4 commits.
# The first commit's message is:

one commit

# This is the 2nd commit message:

# This is the 3rd commit message:

# This is the 4th commit message:

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# rebase in progress; onto 6607ac4
# You are currently editing a commit while rebasing branch 'dev' on '6607ac4'.
#
# Changes to be committed:
#	new file:   .gitignore
#	new file:   css/main.css
#	modified:   index.html
#	new file:   js/arithmetician.js
#	new file:   js/jquery-2.1.0.min.js
#	new file:   js/main.js
#
Merge branch 'dev'

ion of 4 commits.
# The first commit's message is:

one commit

# This is the 2nd commit message:

# This is the 3rd commit message:

# This is the 4th commit message:

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# rebase in progress; onto 6607ac4
# You are currently editing a commit while rebasing branch 'dev' on '6607ac4'.
#
# Changes to be committed:
#	new file:   .gitignore
#	new file:   css/main.css
#	modified:   index.html
#	new file:   js/arithmetician.js
#	new file:   js/jquery-2.1.0.min.js
#	new file:   js/main.js
#

(cherry picked from commit 54dc9e770d3a369f57e7a9336386806dbefb2fc1)