gemlock
Merge branch 'master' of https://github.com/astroza/LNITracker

Conflicts:
	Gemfile.lock
devise issue