Architect0126/CS1 — pull request #2 by Mofatch (2014-07-10 19:55:41+00:00)
Title: arbitrary change, to demonstrate merge

the spaces don't matter. this is just to show how we can make changes to
each other's code.