2014-20-4

Began GUI merger with functions
Save and Open Capabilities
Initial Filter structure
04/27/2014

[4/27/2014]
   Finished merger of available classes
   Fixed issues with
saving
   More complete filtering
      Unique MACs
      Time

Date
      Day of the week
      Month of the year
README update

More thorough
4/30/2014

Fully functional capture and save options
Added more filtering options
-White list MACs
-Black list MACs
-Search single MAC
Makefile for easier compiling

View Changelog.txt for more details
Merge branch 'master' of https://github.com/SirianniJ/WirelessProximityMonitor_474-2135_Pittner-Sirianni-Swerling into SirianniJ-master

attempt to commit pull request
Merge branch 'SirianniJ-master'

Conflicts:
	Changelog.txt