Added string parsing
Merge branch 'gh-pages' of https://github.com/selberts/ProjectEcho into gh-pages

Conflicts:
	calendar.js
Merge branch 'gh-pages' of https://github.com/selberts/ProjectEcho into gh-pages