Getting started on the foo feature
Used totally instead of seriously
Talked about how awesome Treehouse students are
Merge branch 'foo_feature'
Added some class to the file
Make file1 consistent with the new_feature version of file2