switching to developer branch - timothy

this will store changes that I make and will not affect the main module until we are sure that the changes made will work completely as intended.

Changes
---------------
1. moved includes to main.h file for easier reading
Merging with master
Merge pull request #1 from liltimtim/developer-timothy

Developer timothy