Added Cristinas Testimonial
Changed description of Kiosk
Added PHP e-mailing and Google Analytics
Commited .php and got rid of lorem ipsum
Merge branch 'master' of github.com:ozzyoli/ovidaSite
Merge branch 'gh-pages' of github.com:ozzyoli/ovidaSite into gh-pages

Conflicts:
	index.php