working on revision
merging in database files
Merge remote-tracking branch 'origin/master'
Updating git: switch to django. Parse working. Models. Forms. Urls. Templates. Query has unicode errors, work in progress.