a
Merge branch 'master' of https://github.com/jaryroxas/Test into a

Conflicts:
	index.html
Merge pull request #13 from jaryroxas/a

a
test
fix conflict