lala
Merge branch 'master' of https://github.com/FGummesson/tagarp

dfkjah
sakdjf
nana
Merge branch 'master' of https://github.com/FGummesson/tagarp

Conflicts:
	php/sidebar.php
	public/js/script.js

merge message