test pull database
test pull database again
Merge branch 'master' of https://github.com/citizengit/loople
Merge branch 'master' of https://github.com/citizengit/loople
test pulling changes from Kriss
Merge branch 'master' of https://github.com/citizengit/loople
Merge branch 'master' of https://github.com/citizengit/loople
tests on page charlie