commit to update mike
Merge branch 'mike' into kirk
added glyphicons and icomoon svgs and other fonts types
changes css in header, session, inputs root, application, spaces, images. And added html to new user form and new html.erbs
many more css changes, plus stated to alter booking detail page
fixed cal
commiting to be sure
mike pull
trying to pull by adding in other font files
Delete glyphicons-halflings-regular.eot?#iefix

Unable to pull due to error on this file
Delete icomoon.eot?#iefix

unable to pull mike branch cause of this file
Merge branch 'mike' of https://github.com/CodeCloudMe/gathsybeta into mike

Conflicts:
	Gemfile.lock
	app/views/spaces/show/_booking_sidebar.html.erb
	public/complete/assets/arrow_left.png
	public/complete/assets/arrow_left2.png
	public/complete/assets/arrow_right.png
	public/complete/assets/arrow_right2.png
	public/complete/assets/arrowleft.png
	public/complete/assets/arrowright.png
	public/complete/assets/boxed_bgtile.png
	public/complete/assets/bullet.png
	public/complete/assets/bullet_boxed.png
	public/complete/assets/bullets.png
	public/complete/assets/bullets2.png
	public/complete/assets/coloredbg.png
	public/complete/assets/large_left.png
	public/complete/assets/large_right.png
	public/complete/assets/loader.gif
	public/complete/assets/navigdots.png
	public/complete/assets/navigdots_bgtile.png
	public/complete/assets/shadow1.png
	public/complete/assets/shadow2.png
	public/complete/assets/shadow3.png
	public/complete/assets/small_left.png
	public/complete/assets/small_left_boxed.png
	public/complete/assets/small_right.png
	public/complete/assets/small_right_boxed.png
	public/complete/assets/timer.png
	public/complete/assets/transparent.png
	public/complete/css/animate.css
	public/complete/css/bootstrap.css
	public/complete/css/color.css
	public/complete/css/icomoon.css
	public/complete/css/magnific-popup.css
	public/complete/css/responsive.css
	public/complete/css/settings.css
	public/complete/css/style.css
	public/complete/fonts/glyphicons-halflings-regular.eot
	public/complete/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular
	public/complete/fonts/glyphicons-halflings-regular.ttf
	public/complete/fonts/glyphicons-halflings-regular.woff
	public/complete/fonts/icomoon.eot
	public/complete/fonts/icomoon.svg#icomoon
	public/complete/fonts/icomoon.ttf
	public/complete/fonts/icomoon.woff
	public/complete/images/gradient/g30.png
	public/complete/images/gradient/g40.png
	public/complete/images/resource/sliderbg-1.jpg
	public/complete/images/resource/sliderbg-2.jpg
	public/complete/images/resource/team-bg.png
	public/complete/index.html
	public/complete/js/facebook/fb.js
	public/complete/js/init.js
	public/complete/js/jquery-1.11.0.min.js
	public/complete/js/jquery.appear.js
	public/complete/js/jquery.magnific-popup.js
	public/complete/js/jquery.mixitup.min.js
	public/complete/js/jquery.themepunch.revolution.min.js
	public/complete/js/script.js
	public/js/jPayPalCart.css
	public/js/jPayPalCart.js

git commit -m "fixed conflicts"
fixed merge conflicts
pasted github gemfilelock
bundle installed and editted gemlock.file again
fixed code for date picker
switched while running checkout
detail page edited to allow responsiveness
trying to push to heroku
merged in mike