idk
Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
doing this to merge
Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
fixed form still need to add required to form
no idea
fix merge conflic
added more data
Merge pull request #15 from Mathdrquinn/master

more data has been added
fix enroll submit error
Merge pull request #16 from Mathdrquinn/master

fix enroll submit error
News update box
Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
Merge pull request #17 from crotten/master

Created the function to add News/Events
who knows
Merge branch 'master' of github.com:tiy-chs-q4-fee/IronBook
added order sorts to homepage and made read more much more functional
Merge pull request #18 from Mathdrquinn/master

Added ng-orderby to names and types and made the read more button much more funcitonal
event block
fixed merge conflict