Add comments
Merge branch 'jeremy-branch-1' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Media.git into jeremy-branch-1