Jeriel

Merged Damon's changes and integrated twitter bootstrap layout into templates