I hate xcuserstate
xcuserstate
merge mediaObject
ignore more files
xcuserdata....
Merge branch 'master' of https://github.com/camb416/Poison_2013
Pull upstream changes in
Merge branch 'master' of https://github.com/camb416/Poison_2013
Add Bookloader files for testing
add Save xml functionality
add xml load and save functionality
add proj file for merge
merge language and xml branches