changed wait list, added outline to form
fixed merge conflict
pulling from stephen
fixed log in, made made waiting list look like a table, made params accessible