Added database settings
db_var.php
HTML-fix
Added bootstrap
index.js
more meals! i qr.html
map
Merge branch 'master' of https://github.com/PeVeDude/U3_2ME107
qr
added maps
deleted glyphicons
fixed maps
qr stuff
Merge branch 'master' of https://github.com/PeVeDude/U3_2ME107

Conflicts:
	qr/qr.html
wfdwef
js move
ds something
en ds till...
qr stuff
QR maker done?