#added Liquibase
#fixed gitignore
Merge branch 'master' of https://github.com/judg3/LEMP

Conflicts:
	my_cookbooks/app/attributes/default.rb