battlefield pic, text changes
Merge branch 'master' of https://github.com/ral8/wedding