Added addon.txt
'merge'
Fixed #34.
Haha!
Fixed camera exploit
Merge branch 'master' into darkrpFPP
Merge branch 'darkrpFPP'