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

Conflicts:
	index.html
Merge pull request #10 from jaryroxas/meh

meh