Initial Commit
Changed 24 hour support number to 4314
renamed backpack cal for clarity
fixed contractions in contact.html
rearraged items to bring on a outdoor trip
some title change
Me
real merge
testing merge conflict
some more changes to simulate merge conflict
resolved merge conflict
applied stashed change to master
added a few files from pull of remote origin