Merge branch 'master' of https://github.com/Omarcito/js.la

Conflicts:
	public/_layout.jade
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/_layout.jade
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
adds August videos and related images.
Merge pull request #111 from Omarcito/master

Adds August Videos