Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
styled form a little
updated merge conflict
Merge pull request #14 from CTFigueroa/master

Updated merge conflict