Basic Lift App
Merge branch 'master' of github.com:iaefai/lifty

Conflicts:
	README.md