Merge Test
Merged
Updated, Added Static folder