initial commit
Merge branches 'master' and 'resume-layout'