SO NEW
!!!
HOTHOT
WHOAAAAAAA
WUB
Merge branch 'feature/Doing_a_new_feature_anyway' into develop
Merge branch 'feature/badassnewfeature' into develop

Conflicts:
	index.html
Merge branch 'release/1.0'