Changed classes from foundation 3 - foundation 4 eg twelve to Large-12 on most html files
Merged changes fixed conflicts