matt end of day 12/4/2014

matt commit after yeontae commit