add gitignore
add xcuserstate
merge commit
Merge branch 'peter' of github-alanuk:stevepetebruce/SchoolBook into peter

merge commit
merge commit
Merge branch 'peter' of github-alanuk:stevepetebruce/SchoolBook into peter

merge commit
change some xcode stuff