Added files and git ignore
First crit fix implemented
Added fix #2
I merged crit 2 back in
Merge branch 'crit2'