initial file
changed aprils fools day and hog
 veterans change
new year change master
change naw year
resolved conflict
Merge branch 'master' of github.com:tomsercu/assignment2