merge with master
working on nav; fixes
add decorative icons to title of program
add icons for july program
blind commit with new pics
Merge branch 'layout'