Cambios para hacer commit:
	new file:   .gitignore
	new file:   README.md
	new file:   application/cache/index.html
	new file:   application/config/auth_ldap.php.example
	new file:   application/config/autoload.php
	new file:   application/config/config.php
	new file:   application/config/constants.php
	new file:   application/config/database.php.example
	new file:   application/config/doctypes.php
	new file:   application/config/foreign_chars.php
	new file:   application/config/hooks.php
	new file:   application/config/index.html
	new file:   application/config/migration.php
	new file:   application/config/mimes.php
	new file:   application/config/profiler.php
	new file:   application/config/routes.php
	new file:   application/config/skeleton_auth.php.example
	new file:   application/config/smileys.php
	new file:   application/config/user_agents.php
	new file:   application/controllers/index.html
	new file:   application/controllers/skeleton_auth/auth.php
	new file:   application/controllers/skeleton_main.php
	new file:   application/core/index.html
	new file:   application/errors/error_404.php#
	new file:   application/errors/error_db.php
	new file:   application/errors/error_general.php
	new file:   application/errors/error_php.php
	new file:   application/errors/index.html
	new file:   application/helpers/index.html
	new file:   application/hooks/index.html
	new file:   application/index.html
	new file:   application/language/add-new-lang-string.sh
	new file:   application/language/arabic/ion_auth_lang.php
	new file:   application/language/bulgarian/ion_auth_lang.php
	new file:   application/language/catalan/auth_lang.php
	new file:   application/language/catalan/auth_ldap_lang.php
	new file:   application/language/catalan/body_header_lang.php
	new file:   application/language/catalan/ion_auth_lang.php
	new file:   application/language/catalan/skeleton_lang.php
	new file:   application/language/croatian/auth_lang.php
	new file:   application/language/croatian/ion_auth_lang.php
	new file:   application/language/czech/auth_lang.php
	new file:   application/language/czech/ion_auth_lang.php
	new file:   application/language/danish/auth_lang.php
	new file:   application/language/danish/ion_auth_lang.php
	new file:   application/language/dutch/auth_lang.php
	new file:   application/language/dutch/ion_auth_lang.php
	new file:   application/language/english/auth_lang.php
	new file:   application/language/english/auth_ldap_lang.php
	new file:   application/language/english/body_header_lang.php
	new file:   application/language/english/index.html
	new file:   application/language/english/ion_auth_lang.php
	new file:   application/language/english/skeleton_lang.php
	new file:   application/language/estonian/auth_lang.php
	new file:   application/language/estonian/ion_auth_lang.php
	new file:   application/language/finnish/auth_lang.php
	new file:   application/language/finnish/ion_auth_lang.php
	new file:   application/language/french/auth_lang.php
	new file:   application/language/french/ion_auth_lang.php
	new file:   application/language/german/auth_lang.php
	new file:   application/language/german/ion_auth_lang.php
	new file:   application/language/greek/auth_lang.php
	new file:   application/language/greek/ion_auth_lang.php
	new file:   application/language/indonesian/auth_lang.php
	new file:   application/language/indonesian/ion_auth_lang.php
	new file:   application/language/italian/auth_lang.php
	new file:   application/language/italian/ion_auth_lang.php
	new file:   application/language/japanese/auth_lang.php
	new file:   application/language/japanese/ion_auth_lang.php
	new file:   application/language/lithuanian/auth_lang.php
	new file:   application/language/lithuanian/ion_auth_lang.php
	new file:   application/language/norwegian/auth_lang.php
	new file:   application/language/norwegian/ion_auth_lang.php
	new file:   application/language/persian/auth_lang.php
	new file:   application/language/persian/ion_auth_lang.php
	new file:   application/language/pirate/auth_lang.php
	new file:   application/language/pirate/ion_auth_lang.php
	new file:   application/language/polish/auth_lang.php
	new file:   application/language/polish/ion_auth_lang.php
	new file:   application/language/portuguese/auth_lang.php
	new file:   application/language/portuguese/ion_auth_lang.php
	new file:   application/language/romanian/auth_lang.php
	new file:   application/language/romanian/ion_auth_lang.php
	new file:   application/language/russian/auth_lang.php
	new file:   application/language/russian/ion_auth_lang.php
	new file:   application/language/slovak/auth_lang.php
	new file:   application/language/slovak/ion_auth_lang.php
	new file:   application/language/slovenian/auth_lang.php
	new file:   application/language/slovenian/ion_auth_lang.php
	new file:   application/language/spanish/auth_lang.php
	new file:   application/language/spanish/auth_ldap_lang.php
	new file:   application/language/spanish/body_header_lang.php
	new file:   application/language/spanish/ion_auth_lang.php
	new file:   application/language/spanish/skeleton_lang.php
	new file:   application/language/swedish/auth_lang.php
	new file:   application/language/swedish/ion_auth_lang.php
	new file:   application/language/turkish/auth_lang.php
	new file:   application/language/turkish/ion_auth_lang.php
	new file:   application/language/ukrainian/auth_lang.php
	new file:   application/language/ukrainian/ion_auth_lang.php
	new file:   application/language/zh_cn/auth_lang.php
	new file:   application/language/zh_cn/ion_auth_lang.php
	new file:   application/language/zh_tw/auth_lang.php
	new file:   application/libraries/Auth_Ldap.php
Merge branch 'master' of https://github.com/kriminal666/skeletonbasic

Conflicts:
	.gitignore
	README.md