Merge branch 'glen'
Formatting
fixed gitignore and added answers
added another test