ignore sync.php file
Merge branch 'dev'
delete sync pull
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
revert to icons on bottom and larger heading
Merge branch 'master' into dev