removed idea
Merge branch 'master' of https://github.com/travisrussi/barmix

Conflicts:
	.idea/workspace.xml
finished first pass at pages