Major bug fixed day 0
Added .gitignore
Merge remote-tracking branch 'origin2/master'