fixed constructors
fixed merge conflicts
merge
fixed merge conflicts
fixed merge conflicts
vicmerge MSG WORKS
fixed messageList remove
fixed merge conflicts
added timer to unit1 and test1
config
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
Merge branch 'jessica'
Fixing persistent data loading
aderp
Merge errors fixed with test1 working
Made elements serializable
added testinterface
popo
config properties
fix merge changes