fixed index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
Sorted out a few white spaces
Css sheet updated
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
Fixed the problem with the head tags
Merge remote-tracking branch 'james/master'
* we're starting to get annoyed by Jame's commits!
Conflicts:
	src/index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
fixed  merge error
added js file
added js file
added index 2
Something

Unknown
Merge remote-tracking branch 'james/master'
Merge remote-tracking branch 'James/master'

Conflicts:
	src/index.html