crying T_T
Merge branch 'master' of https://github.com/amruthv/AutoPS

Conflicts:
	AutoPS/config.txt