first commit
updated vagrantfile
html testing
readme updated
updated gitignore
Merge branch 'master' of github.com:OSteEL/happening-planner

Conflicts:
	README.md