made default object a dagger
Merge branch 'master' of https://github.com/kor8der/SummerProject2013