first real one

Signed-off-by: Sam Nelson <snelso15@ycp.edu>
Merge pull request #1 from snelso15/master

first real one