2014/06/03 term project temporate version
Merge 2014/06/03 term project temporate version