Added 2 files to repository.
Merge branch 'master' of https://vENOM133133@code.google.com/p/v655y748-cs680-sp2014-git/