minor fix
Merge branch 'master' of github.com:smksyj/2014_Wireless_Project
Merge branch 'master' of github.com:smksyj/2014_Wireless_Project
complete simulation code
Merge branch 'master' of github.com:smksyj/2014_Wireless_Project

Conflicts:
	scratch/Network_Project_Experiment.cc
	src/carafwifimanager/model/carafwifimanager.cc
apply CARA
Merge branch 'master' of github.com:smksyj/2014_Wireless_Project
add simulation scripts
delete log
Merge branch 'master' of github.com:smksyj/2014_Wireless_Project

Conflicts:
	src/wifi/model/dca-txop.cc
	src/wifi/model/wifi-remote-station-manager.cc