Conflicts:
	config/routes.rb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/v3.0/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache
	tmp/cache/assets/development/sprockets/v3.0/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache
	tmp/cache/assets/development/sprockets/v3.0/I9Ji3hKbhOCXCg5Or8mdoK35rCPPZCSeNUUiuHJ176w.cache
	tmp/cache/assets/development/sprockets/v3.0/L7aNWD1crguFbnN-7P-rQ8EuXCdRWpoCAljBwnW5WHM.cache
	tmp/cache/assets/development/sprockets/v3.0/M2QkBLkYs8h2HFnvfb_V-EZijwGffh_dRxT2PE9c-qI.cache
	tmp/cache/assets/development/sprockets/v3.0/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache
	tmp/cache/assets/development/sprockets/v3.0/Rg9zF-r4i30dCDqf1liB5QgAYgUxXQ5PJhcaph3ExX8.cache
	tmp/cache/assets/development/sprockets/v3.0/Zrw530C9TdmM7u16wgfkRqCISQ-aZF76pA2F94cUIJ0.cache
	tmp/cache/assets/development/sprockets/v3.0/_yyL6JyP9T7ba90rjpg4c9BBB_iJeq3zKRNCMxuKRdg.cache
	tmp/cache/assets/development/sprockets/v3.0/aj9QXkBktPm2MURu7oWVVn0su4bBP3w_KWZ8kwYreBU.cache
	tmp/cache/assets/development/sprockets/v3.0/ba5q0LrZyjpxvBEhzohuDgBr8OVsCptQlZqbM0Wu_sU.cache
	tmp/cache/assets/development/sprockets/v3.0/cCWzACoMLbHAWSqc96Q-QZAgsVtE-jxVEZ49bMdxAxc.cache
	tmp/cache/assets/development/sprockets/v3.0/gdIl6gH0nW_qx7Ffm32WAfula9LkauWYXgXECjLjXPY.cache
	tmp/cache/assets/development/sprockets/v3.0/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache