adding comment
adding some more comments
new file index [issue 53]
fixed main page
Adding more html
Merge branch 'iss53'

Conflicts:
	index.html
Merge branch 'testing'

Conflicts:
	app.js