мой git-проект
Merge branch 'master' of https://github.com/ExBaD/whattodo

Conflicts:
	application/classes/Controller/OAuth.php
	application/config/database.php
	application/views/header.php
	static/css/style.css
добавил bootstrap
убрал database.php из проекта