first new commit
Merge branch 'simple-capybara-demo' of https://github.com/ifpingram/squeaker into simple-capybara-demo

Conflicts:
	.gitignore
	features/greet_user.feature