Commiting! Scaary
Merge branch 'master' of https://github.com/Dracir/RickiesRempage

Conflicts:
	Assets/Scripts/Test/Rickie.cs
popup

Signed-off-by: Travis Martin <travis.h.martin@gmail.com>