db
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/database.sql
Remove underline from links, add contact page, update database, add charset to <head>, fix css errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/contact/contact_index.php
Remove country section