added assets'
Merge branch 'stanzheng' of github.com:stanzheng/cs594-f13 into stanzheng