not working yet. Can't get votes to work on answers
uesed rake db:migrate to create table for tags on local machine
answers can be voted up or down - 80% of the functionality there but still need to do ordering by number of votes
voting functionality workinf for both photo and answer. Just need to be sortable by number of votes.
core functionality of answers and votes working
fixing conflicts
Photo answer and voting functionality working
Merge branch 'master' of https://github.com/issamsultan/pro2

Conflicts:
	stockoverflow/log/development.log
	stockoverflow/tmp/cache/assets/C91/A30/sprockets%2Ff8540539c4815677d1dd86d3426682ea
	stockoverflow/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	stockoverflow/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	stockoverflow/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	stockoverflow/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	stockoverflow/tmp/cache/assets/DBA/000/sprockets%2F2fca4d5c180d7d5cffb995ed8464889e
	stockoverflow/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	stockoverflow/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af