Fixed a stroke bug
merge
Added Niki's changes to Nikki's repo
merge
Everyone's changes are in here, play around and tell us what the best combo in
merge
merge