more awesome
like this one better

Merge branch 'master' of https://github.com/zhuob/Project2014

Conflicts:
	awe.R
Merge branch 'master' of https://github.com/zhuob/Project2014
Merge branch 'master' of https://github.com/zhuob/Project2014
Merge branch 'master' of https://github.com/zhuob/Project2014
Merge branch 'master' of https://github.com/zhuob/Project2014
Jun 2nd
updated manual