vk_omniauth first commit
Merge branch 'master' of https://github.com/KernelCorp/nostradamus
vk_omniauth nearly done
vk_omniauth nearly done 2
vk_omniauth final
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.haml