Merge remote-tracking branch 'upstream/master'
Modified Teacher, TeachersDAO, Group, GroupsDAO and TestGroupGenerator. I did not commit the database since I would up deleting alot of info while trying to change the datatypes. Instead of what I did I reccomend you use your database browser to make the data type change. Open up your database browser, on the Database Structure tab (this is the default tab when you open the browser), you will see a list of the tables. Right click the Group_ table. You should get an option that says Modify Table, click this option. You will be forwarded to a window that displays the properties of that table. Scroll down to the Teacher column and click the dropdown box. Select VARCHAR as the data type then click OK. At the top menu you will see an option that says Write Changes, click this to save your changes. Now your database should be consistant with the changes I made to the system.
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from JamesEHammond/master

Pull Request From JamesEHammond 10/23/2014