login
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	core