added alert
Merge branch '07.06.2013'
Alert 2 testing
Merge branch 'master' of https://github.com/mwitt8178/bogusdomain
added "brand new" alert
Merge branch 'new-branch'
Merge branch 'master' of https://github.com/mwitt8178/bogusdomain
Testing 3
Testing 4
Testing 4
Merge branch 'new-branch'

Conflicts:
	js/studentPortal.js
blah
Merge branch 'MW-7.6.2013-rev.1' into 07.06.2013

Conflicts:
	js/studentPortal.js
Js Upload