after being foced to switch to svn for cs310, i am now finally using git again
Merge pull request #16 from bmwaechter/master

bmwaechter