Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch feature/add_bt-menu
 Changes to be committed:
	new file:   .gitignore
	new file:   css/icons.css
	modified:   css/slider.css
	new file:   css/style5.css
	new file:   fonts/codropsicons/codropsicons.eot
	new file:   fonts/codropsicons/codropsicons.svg
	new file:   fonts/codropsicons/codropsicons.ttf
	new file:   fonts/codropsicons/codropsicons.woff
	new file:   fonts/codropsicons/license.txt
	new file:   fonts/demoicons/FontAwesome.dev.svg
	new file:   fonts/demoicons/FontAwesome.eot
	new file:   fonts/demoicons/FontAwesome.svg
	new file:   fonts/demoicons/FontAwesome.ttf
	new file:   fonts/demoicons/FontAwesome.woff
	new file:   fonts/demoicons/license.txt
	new file:   fonts/demoicons/minicons-webalys.eot
	new file:   fonts/demoicons/minicons-webalys.svg
	new file:   fonts/demoicons/minicons-webalys.ttf
	new file:   fonts/demoicons/minicons-webalys.woff
	modified:   index.html
	new file:   js/borderMenu.js
	new file:   js/classie.js
	new file:   js/imagesloaded.pkgd.min.js
Merge branch 'gh-pages' of http://github.com/EricaChang/weddingsite into develop

Conflicts:
	css/slider.css
	index.html

 Changes to be committed:
	new file:   css/component.css
	modified:   css/slider.css
	modified:   css/style.css
	modified:   images/large/AV9P1156-l.jpg
	modified:   images/large/AV9P1185-l.jpg
	modified:   index.html
	new file:   js/sidebarEffects.js
	deleted:    readme.md
 Changes to be committed:
	modified:   css/style.css
	modified:   index.html
	modified:   js/gallery.js