Added Goals, Welcome Pages, worked on trumpia.
Merging in doug
spelling in devise edit
resolved conflicts