add single-project.php
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/single-project.php
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/single-project.php
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/single-project.php
Merge remote-tracking branch 'upstream/develop' into develop
test
Merge remote-tracking branch 'upstream/develop' into develop
before Kamilla and Quincy
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	assets/css/main.css
	wp-content/themes/mfadt14/single-project.php
commit 001
Merge branch 'develop_rewrite' into develop
merge develop_rewrite into develop
add header-homepage
add project detail css
add project detail css
add project detail css
add project detail css
add project detail css
Fix merge conflicts from Apon's rewrite
Bugfixed & cleanup for Apon's rewrite
Merge branch 'palaa159-develop' into develop