fede commit
Fixing POR-666
local oliver changes
A new common function and my readme
Add my home readme
Local changes by Kyle
Merge remote-tracking branch 'upstream/master'
Fixing conflicts with Fede
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alert.js
Merge remote-tracking branch 'upstream/master'
Merged by Burke.
Conflicts:
	alert.js
Fixing conflicts between POR-666 and BKO
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alert.js
Merge remote-tracking branch 'upstream/master' - oliver was here

Conflicts:
	alert.js
kyle work
kyle work