merged branches
Merge branch 'gh-pages'

Conflicts:
	beta/.DS_Store
added pics folder
Merge branch 'master' into gh-pages