test
test
Merge branch 'master' of https://github.com/otsuru/geeiku

Conflicts:
	fuel/app/_autocomplete.php
	fuel/app/classes/controller/ggxxsns.php
	fuel/app/classes/controller/ggxxsns/users.php
	fuel/app/classes/controller/login.php
	fuel/app/classes/controller/logout.php
	fuel/app/classes/controller/resourcerest.php
	fuel/app/classes/controller/search.php
	fuel/app/classes/controller/searchtest.php
	fuel/app/classes/controller/users.php
	fuel/app/classes/controller/userstest.php
	fuel/app/classes/model/checkin.php
	fuel/app/classes/model/gamecenter.php
	fuel/app/classes/model/gamecentertest.php
	fuel/app/classes/model/user.php
	fuel/app/config/db.php
	fuel/app/config/theme.php
	fuel/app/migrations/001_create_users.php
	fuel/app/migrations/002_create_gamecenter.php
	fuel/app/views/default/footer.php
	fuel/app/views/default/header.php
	fuel/app/views/login/index.php
	fuel/app/views/search/index.php
	fuel/app/views/search/result.php
	fuel/app/views/searchtest/index.php
	fuel/app/views/searchtest/result.php
	fuel/app/views/template.php
	fuel/app/views/theme/header.php
	fuel/app/views/users/index.php
	fuel/app/views/userstest/index.php
	fuel/core/.gitignore
	fuel/core/classes/image/extend.php
	fuel/core/vendor/markdown/License.text
	fuel/packages/HTTP/Request2.php
	fuel/packages/HTTP/Request2/Adapter.php
	fuel/packages/HTTP/Request2/Adapter/Curl.php
	fuel/packages/HTTP/Request2/Adapter/Mock.php
	fuel/packages/HTTP/Request2/Adapter/Socket.php
	fuel/packages/HTTP/Request2/CookieJar.php
	fuel/packages/HTTP/Request2/Exception.php
	fuel/packages/HTTP/Request2/MultipartBody.php
	fuel/packages/HTTP/Request2/Observer/Log.php
	fuel/packages/HTTP/Request2/Response.php
	fuel/packages/TwitterRequest/TwitterRequest.php
	fuel/packages/auth/.gitignore
	fuel/packages/oil/.gitignore
	fuel/packages/orm/.gitignore
	fuel/packages/parser/.gitignore
	fuel/packages/parser/vendor/markdown/License.text
	sqldata/gamecenter.sql
	sqldata/gamedata.txt
	sqldata/mst_user.sql
	sqldata/tbl_checkin.sql
	sqldata/tempotuila.txt
	sqldata/tenpotuiak.txt
	www/.htaccess
	www/admin/.htaccess
	www/css/bootstrap-responsive.css
	www/css/bootstrap-responsive.min.css
	www/css/bootstrap.css
	www/css/bootstrap.min.css
	www/css/bootstrap_base.css
	www/css/common.css
	www/css/prettyPhoto.css
	www/entry_conf.php
	www/ggxxsns/.htaccess
	www/ggxxsns/assets/css/bootstrap-responsive.css
	www/ggxxsns/assets/css/bootstrap-responsive.min.css
	www/ggxxsns/assets/css/bootstrap.css
	www/ggxxsns/assets/css/bootstrap.min.css
	www/ggxxsns/assets/css/common.css
	www/ggxxsns/assets/js/bootstrap.js
	www/ggxxsns/assets/js/bootstrap.min.js
	www/ggxxsns/assets/js/iine.js
	www/ggxxsns/assets/js/jquery-1.6.1.min.js
	www/ggxxsns/ssi/header_menu.html
	www/js/bootstrap.js
	www/js/bootstrap.min.js
	www/js/jquery-1.6.1.min.js
	www/js/jquery.js
	www/js/jquery.prettyPhoto.js
	www/php.ini
	www/services.php
	www/ssi/footer_menu.html