rails init
cap install
devise setting
mysql2
inno.repang.net
Merge branch 'master' of https://github.com/grammaright/evezaryEvent
test 삭제
Merge branch 'master' of https://github.com/grammaright/evezaryEvent

Conflicts:
image/popup/applyPopup_X.png
image/popup/applyPopup_close.png
public/image/popup/applyPopup_X.png
public/style.css
create base schema
ignore change
mms 완료
user created mms done
Merge branch 'master' of https://github.com/onesup/evezaryEvent

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/user.rb
	config/initializers/devise.rb
	config/routes.rb
	db/migrate/20140128122057_devise_create_users.rb
	db/schema.rb
	db/seeds.rb
	image/main/cloud/cloud_2.png
	image/main/cloud/cloud_3.png
	image/main/cloud/cloud_4.png
	image/popup/2/applyPopup2_BG2.png
	image/popup/2/applyPopup2_send.png
	image/popup/3/applyPopup3_CautionAllow.png
	image/popup/3/applyPopup3_CautionDisallow.png
	image/popup/3/applyPopup3_CautionLabel.png
	image/popup/3/applyPopup3_CautionLabel2.png
	image/popup/3/applyPopup3_CautionShow.png
	image/popup/3/applyPopup3_Fin.png
	image/popup/3/applyPopup3_InputLabel_2.png
	image/popup/3/applyPopup3_InputLabel_3.png
	image/popup/3/applyPopup3_InputLabel_4.png
	image/popup/3/applyPopup3_Line.png
	image/popup/6/applyPopup6_BG.png
	image/popup/6/applyPopup6_Check.png
	image/popup/6/applyPopup6_Label_1.png
	image/popup/6/applyPopup6_download.png
	public/html/popUp_1.html
	public/html/popUp_2.html
	public/html/popUp_3.html
	public/html/popUp_4.html
	public/html/popUp_5.html
	public/html/popUp_blog.html
	public/image/main/characterImage.png
	public/image/main/cloud/cloud_2.png
	public/image/main/cloud/cloud_3.png
	public/image/main/cloud/cloud_4.png
	public/image/main/logo.png
	public/image/mpopup/1/m1_background.png
	public/image/mpopup/1/m1_send.png
	public/image/mpopup/2/m2_CautionBtn.png
	public/image/mpopup/2/m2_Label3.png
	public/image/mpopup/2/m2_Label4.png
	public/image/mpopup/2/m2_Label5.png
	public/image/mpopup/2/m2_Label6.png
	public/image/mpopup/2/m2_Label7.png
	public/image/mpopup/2/m2_Label8.png
	public/image/mpopup/2/m2_Label9.png
	public/image/mpopup/2/m2_LongLine.png
	public/image/mpopup/2/m2_endButton.png
	public/image/popup/2/applyPopup2_BG2.png
	public/image/popup/2/applyPopup2_send.png
	public/image/popup/3/applyPopup3_CautionAllow.png
	public/image/popup/3/applyPopup3_CautionDisallow.png
	public/image/popup/3/applyPopup3_CautionLabel.png
	public/image/popup/3/applyPopup3_CautionLabel2.png
	public/image/popup/3/applyPopup3_CautionShow.png
	public/image/popup/3/applyPopup3_Fin.png
	public/image/popup/3/applyPopup3_InputLabel_2.png
	public/image/popup/3/applyPopup3_InputLabel_3.png
	public/image/popup/3/applyPopup3_InputLabel_4.png
	public/image/popup/3/applyPopup3_Line.png
	public/image/popup/6/applyPopup6_BG.png
	public/image/popup/6/applyPopup6_Check.png
	public/image/popup/6/applyPopup6_Label_1.png
	public/image/popup/6/applyPopup6_download.png
	public/image/popup/blog/applyPopup6_BG.png
	public/image/popup/blog/applyPopup6_Check.png
	public/image/popup/blog/applyPopup6_Label_1.png
	public/image/popup/blog/applyPopup6_download.png
	public/index.html
	public/js/ef.js
	public/style/style.css
Merge onesup/evezaryEvent