Merge pull request #14 from comjosh64/gh-pages

Adding Object Oriented Programming with Java Minilecture.
Add .nojekyll so we don't try to use jekyll
Merge pull request #16 from terribleplan/gh-pages

Fix #15
Empty .nojekyll
Responsive
Merge pull request #17 from terribleplan/gh-pages

Responsive, Fix #15
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	rest/lessons1.json
	rest/videos1.json
Adding web developer skills minilecture
Add a bunch of android videos