Refreshing the justin kelly theme files.
Re adding the justin kelly theme files.
Merge branch 'master' into upmaster