df

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>
Merge branch 'master' of https://github.com/bewoldt/studentlife

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>

Conflicts:
	index.php