conflict
Merge branch 'master' of https://github.com/bionique/Github

Conflicts:
	bioniquedev/wp-content/themes/bionique2014/home.php