more feature branch changes
Merge pull request #2 from brittlewis12/britt

more feature branch changes