Merged!
Added Version 1
Bug Fixed
Merge branch 'Edit-Master' into Version-1.0

Conflicts:
	index.html