Incorporated a new arrayToLine, expanded the role of fileLocations.php, split status.txt into status_begin and status_end, and added IDs to each login
Updated CombineData to work with new data structure
simplify duration
Merging Mikey+Adam's

Merge remote-tracking branch 'GikeyMarcia/master' into exp

Conflicts:
	Code/CustomFunctions.php
	Code/FinalQuestions.php
	Code/done.php
	Code/fileLocations.php
	Code/login.php
	Code/trial.php
	Experiment/instructions.php
	index.php
	multiSession.php
Merge https://github.com/gikeymarcia/Collector into exp
Redid the instructions include, and updated a few form inputs
Fixed a few bugs in login