session strategry
Merge branch 'envato_wip' of github.com:envato/flip into envato_wip

Conflicts:
	lib/flip.rb
Merge branch 'envato_wip' of github.com:envato/flip into envato_wip