modified .gitignore
fixed untracked files
Merge branch 'marius' into justin