fixed constructors
fixed merge conflicts
merge
fixed merge conflicts
fixed merge conflicts
fixed messageList remove
fixed merge conflicts
added timer to unit1 and test1
config
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
Merge branch 'jessica'