style in index
merge with remote
reorder files and fix exercise layout