avista
Merge branch 'master' of http://github.com/KernelCorp/landings
Merge branch 'master' of http://github.com/KernelCorp/landings
Merge branch 'master' of http://github.com/KernelCorp/landings
Merge branch 'master' of http://github.com/KernelCorp/landings
anna link
Merge branch 'master' of http://github.com/KernelCorp/landings

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/master'