added mybadges page and fixed xml error
fixed misspelling
merged with tomMerge branch 'performance' of https://github.com/creighton/competency-example into tetris
merged with tom againMerge branch 'performance' of https://github.com/creighton/competency-example into tetris
added perf funcs
Merge pull request #12 from creighton/performance

Performance
pulled from upstreamMerge branch 'performance' of https://github.com/adlnet/competency-example into tetris
added my badges page that works
Merge pull request #13 from ljwolford/tetris

Tetris
added admin and all comps page
added fwk form back in
forgot to include perf parse
changed lrs endpoint
added parse fwk to reset
added check for tetris comps
added check for tetris comps in template
Merge pull request #14 from ljwolford/tetris

added admin and all comps page
Merge branch 'performance' of github.com:adlnet/competency-example into performance
fixed nested row issue