Settings added
Settings Added..
WTF HAPPEND?!
Merge branch 'master' of https://github.com/royb3/Energy_Vampires

Conflicts:
	RealTime_V2/server.js