Merges updated master
Lints all files within project