new repo
Initial commit
new repo
integrated design
Merge branch 'master' of github.com:wario4/gics

Conflicts:
	README.md
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/routing.yml
	app/cache/dev/profiler/index.csv
	app/cache/dev/templates.php
	app/cache/dev/twig/1d/f6/4298ad883ca05d8971a01cdc9f9b933843700e71e3bdff6673b170212820.php
	app/cache/dev/twig/59/df/f48bbf8751c66b17a42bdec93c627ad90548fa55a16b8bc7e18b8f53f5f9.php
	app/cache/dev/twig/6c/32/195d43b017c1f1adea2d9c9194bf72592b5396f2a862f54e0ea9b2ee0187.php
	app/cache/dev/twig/7e/12/ce8a210a2b00ca592391b1a929b5402924848aa3179d928441c277672b39.php
	app/cache/dev/twig/89/9a/73f0951b420329739532d28f943839537dd71db591d58de8fde74b2f3c07.php
	app/cache/dev/twig/b9/20/5c3109a2a352be4d427ec1e52ecd82c7090e8470a086d2659aefb79feea3.php
	app/cache/dev/twig/d1/8b/ef5914728169119178757446db799232a844cf04fb255364b88699cb061a.php
	app/cache/dev/twig/d2/07/78f60ae6b4d19faf5f9bcaa368198b0adad16a1007cac7fa94ddae64d362.php