first commit on new branch
initial push
backup before merging
Merge branch 'master' into gallery
back up before merge
Merge branch 'master' into gallery
Merge branch 'master' into gallery
Merge branch 'master' into gallery
Merge branch 'master' into gallery
merged
backup stuff
Merge branch 'master' into gallery
Merge branch 'master' into gallery
beginning work on gridview
Merge branch 'master' into gallery
backing up before merge
Merge branch 'master' into gallery
backup
Merge branch 'master' into cole_gallery_fixes
bug fixes on gallery