Recloning repo
Merge branch 'master' of https://github.com/josefjoy/adam-daniel

Conflicts:
	twentytwelve-child/images/nya-logo.png