ace static
ace static
Merge branch 'master' of https://github.com/KOPOJI/codes

Conflicts:
	.idea/workspace.xml
	tmp/cache/assets/development/sass/67edb3ad59f8d6a9800932377dd3dc1ceccc29a1/codes.css.scssc
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/8ad7c5149f1602b3dc3ffb70b64cb6b8
	tmp/cache/assets/development/sprockets/912637e56d5a38b4bd36acb21706eddc
	tmp/cache/assets/development/sprockets/cb483830995e6e8c3caec7a0780b323b
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655