!

hi
Merge remote-tracking branch 'origin/master'

Conflicts:
	pam.txt
:D

fmlae
Merge branch 'master' of https://github.com/Nspyre-Internship-2014/Nspyre-Last-Drop