decause/hflossk — pull request #396 by danShumway (2014-05-21 18:16:08+00:00)
Title: Sending stuff to merge

Changing propproj over to the correct things, adding the two extra credit things.