first line added
added line of code to bottom
added a very thoughtful line to the readme file
Merge pull request #4 from jgregorynoctrl/master

added a very thoughtful line to the readme file
fixed conflict
Merge pull request #5 from cstclair/master

Stuff
project skeleton
Merge branch 'master' of https://github.com/cstclair/CSC694-Assessment
Merge pull request #6 from cstclair/master

Project Skeleton
added htaccess and local.php.dist to gitignore;
removed local.php.dist and htaccess from repository
added base User Controller and supporting files
changed sentence in user controller index action
Merge pull request #7 from jgregorynoctrl/master

Removing .htaccess and local.dist.php from repository