updated gallery with pikachoose plugin
Removed generated files
updated gitignore
resolved merge conflict