front
Merge branch 'master' of http://github.com/ashleeai/cloud-assign2