Added Isotope Filtering
Merge branch 'Adding-Isotope-Filtering'
Merge branch 'master' of https://github.com/webcraftniray/MampStartpage

Conflicts:
	index.php