Merge branches

Merge
Removed older files no longer in use or been replaced.
Merge branch 'gh-pages'

Conflicts:
	.DS_Store
	asdproject/app/_attachments/index.html
Merge branch 'master' into gh-pages