Initial commit
Старт
Merge branch 'master' of github.com:bairinc0/bsuobserver
А вот
Merge branch 'master' of github.com:bairinc0/bsuobserver

Conflicts:
	README.md
	library/db/db.php