2.0
Merge branch 'master' of https://github.com/aMilo/echoMilo-Website

Conflicts:
	.DS_Store
	DB/www/.DS_Store
	Symfony/.DS_Store
	Symfony/src/Blogger/BlogBundle/.DS_Store
	admin/delete-article-script.php
	admin/index.php
	css/bootstrap.min.css
	functions.php
	index.php
	intro.php
	js/.DS_Store
	js/bootstrap.min.js
	pages/.DS_Store
	pages/about.php
	pages/contact.php
	pages/stream.php
	queryfunctions.php