Fixed indentation in both models and schemas
Removed log file from git && created a gitignore file
Merge pull request #2 from tiger-swallowtails-2014/fixing_indentation_alisa

Fixing indentation alisa
fixed merge conflict