WIP, DON'T PUSH
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/locations/show.html.erb
Add pic to instructors
Merge branch 'leaders' into pre-leaders

Conflicts:
	app/views/locations/show.html.erb
Merge pull request #20 from TIYA-Durham-GDI/pre-leaders

Pre leaders
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/locations/show.html.erb
merged master
animation on h1