Signed-off-by: avandenheuvel <apvandenheuvel@yahoo.com>
Merge branch 'master' of https://github.com/avandenheuvel/MachineWorx into apv
Begin forum implementation
MOre work on forum
Forum updates

Mostly styling.
Work on Forum

Added updates. Basic form and function created.
Update of login

Allows forum to work with current user login
Merge branch 'master' of https://github.com/avandenheuvel/MachineWorx into apv
More work on Forum
Updated to regain functionality of add topic

includes login.php had changed
Forum updates

Still some work to do.
Merge branch 'master' of https://github.com/avandenheuvel/MachineWorx into apv

Conflicts:
	Admin/adminOptions.php
Merge pull request #9 from avandenheuvel/apv

branch apv merged with master