merging
Merge branch 'gh-pages'

Conflicts:
	_site/index.html
	_site/javascript/index.html
objective-c done
Android Development
Merge pull request #1 from MontazzeStudio/master

Master