Removed remnant questionanswer stuff

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/jethrokuan/ol2
Updated the redirect_to URLs for the GDrive import. This will change once the update page comes up

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Flipped the middle finger at SASS (horrible preprocessor, I insist) and creation of the update page

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/jethrokuan/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	app/controllers/usr_controller.rb
	app/views/usr/staff.html.erb
Merge branch 'master' of https://github.com/jethrokuan/ol2
Updated vendorer and cleaned up gemfile

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Updated Gemfile
Resolved Conflict