pushed footer to the bottom everywhere, fix merge conflicts
export bootstrap changes to new file
add modernizr to contact_thanks
commit
Merge pull request #25 from DaliaResearch/updates

Updates