2/27 2:38

Added multi-tasking buttons prevention
Closed Unity this time
2/27 406

saving to test pull request
Merge remote-tracking branch 'upstream/master' into branch
end of Day 2/27
asdjkfh;
alfsdkklsdjFsxncMerge branch 'master' of https://github.com/DevenSmith/TrickyNinja-1 into DevenSmith-master

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
start of day
ask;fMerge remote-tracking branch 'upstream/master' into branch

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Profiles workings correctly
end of day 2/28 added camera fix
2-28-2014 1729 deven
JasonMerge
Merge branch 'master' of https://github.com/ScrambledEgge101/Trickyninja-1 into ScrambledEgge101-master

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/Assets/Prefabs/PlayerPrefab.prefab
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja/ProjectSettings/TagManager.asset
Merge branch 'DevenSmith-master'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'DevenSmith-master' into pr/7

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'pr/7'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
I don't know what all this stuff is

It just appeared on my computer after I pseudo-merged the master stuff
with my computer. I have no idea where it came from or in what ways it
is going to damage the master...Apply at your own risk (which means
probably not).