df_data stuffs
Merge branch 'master' of https://github.com/sveinou/DF

Conflicts:
	df_login.py
df_login stuffs