Merge branches 'dev' and 'ajax' into dev
Code Coverage done for today
Gemfile updated
added private AWS key, modified readme
final merge
Merge branch 'dev'

Conflicts:
	README.rdoc
precompile assets
added instructions on how to drag images around
rvm comments to readme
added EC2 information to readme
Implemented paperclip
Image Uploading
readme updated before master merge
d
deleted dev log
fixed image sort and save
dev log
devlog
Finished image saving, displaying
Removed the remote bootstrap import in Lecture Viewer. This was overriding local CSS and is what was screwing up the layout on the page. This has had the effect of removing the border around the buttons-- please use a class included in the local bs files, or just leave as is for now"