Login Updates and Assets Loading
Merge branch 'master' of https://github.com/Grizzard/2014-2015-Launch-Pad

Conflicts:
	header.php