Before pull
before pull
Merge branch 'master' of https://github.com/StefanKrulj/IT-Forum

Conflicts:
	js/database.js