powellmichael/tiy-fe-group-project1 — pull request #6 by thachmle (2014-06-27 12:14:24+00:00)
Title: updated readme

conflict resolved in readme