changes to application and index files
another commit
friday morning commit
2nd friday commit
fixed merge conflicts
Merge branch 'patrick3'