moving images;
add some markdown input stuff
Merge branch 'sean' into rob
loading teachers
wip
Merge branch 'sean' into keith
update to ruby 2.1.1
basic image uploads
Merge branch 'master' of github.com:FerneyHorde/yearbook
Merge branch 'keith'
updating .gitignore
Merge branch 'master' of github.com:FerneyHorde/yearbook

Conflicts:
	.gitignore
	Gemfile
image paperclip
Merge branch 'master' of github.com:FerneyHorde/yearbook

Conflicts:
	Gemfile.lock
adding in paperclip portrait to person
configure s3 for paperclip
configure s3 for paperclip
updating gemfiles
updating asset sync
fixing images