added line 3
Merge pull request #1 from TAMULib/example-app_sprint1_01234_add_line_3

added line 3
added line two
resolved merge conflict
Merge pull request #3 from TAMULib/example-app_sprint1

Example app sprint1