asd
Merge branch 'master' of github.com:mihassin/tietokantasovellus-s2013

Conflicts:
	views/add-offer.php